Qualify calls to std::next(), to avoid conflicts with libraries/applications that define their own 'next' template. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@130511 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/deque b/include/deque index cb1d147..369e9b8 100644 --- a/include/deque +++ b/include/deque
@@ -1787,7 +1787,7 @@ --__base::__start_; ++__base::size(); if (__pos > 1) - __b = __move_and_check(next(__b), __b + __pos, __b, __vt); + __b = __move_and_check(_STD::next(__b), __b + __pos, __b, __vt); *__b = *__vt; } } @@ -1847,7 +1847,7 @@ --__base::__start_; ++__base::size(); if (__pos > 1) - __b = _STD::move(next(__b), __b + __pos, __b); + __b = _STD::move(_STD::next(__b), __b + __pos, __b); *__b = _STD::move(__v); } } @@ -1905,7 +1905,7 @@ --__base::__start_; ++__base::size(); if (__pos > 1) - __b = _STD::move(next(__b), __b + __pos, __b); + __b = _STD::move(_STD::next(__b), __b + __pos, __b); *__b = value_type(_STD::forward<_Args>(__args)...); } } @@ -2621,7 +2621,7 @@ } else { // erase from back - iterator __i = _STD::move(next(__p), __base::end(), __p); + iterator __i = _STD::move(_STD::next(__p), __base::end(), __p); __alloc_traits::destroy(__a, _STD::addressof(*__i)); --__base::size(); if (__back_spare() >= 2 * __base::__block_size) 